Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge